From 3872fe471821a8d44448fae36037970e46c8f957 Mon Sep 17 00:00:00 2001 From: Boyuan Yang Date: Sat, 23 May 2020 11:25:48 -0400 Subject: [PATCH] debian/rules: Drop old/useless cmake workaround --- debian/patches/0003-use-system-libraries.patch | 4 ++-- debian/rules | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/debian/patches/0003-use-system-libraries.patch b/debian/patches/0003-use-system-libraries.patch index be85683..99ba9e4 100644 --- a/debian/patches/0003-use-system-libraries.patch +++ b/debian/patches/0003-use-system-libraries.patch @@ -7,7 +7,7 @@ Subject: use-system-libraries 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 4883990..f6eccad 100644 +index 4883990..e600408 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,7 +1,7 @@ @@ -15,7 +15,7 @@ index 4883990..f6eccad 100644 -include_directories(../deps/marisa-0.2.5/include) -include_directories(../deps/rapidjson-1.1.0) -include_directories(../deps/tclap-1.2.2) -+include_directories(/usr/include/marisa) ++#include_directories(/usr/include/marisa) +include_directories(/usr/include/rapidjson) +include_directories(/usr/include/tclap) diff --git a/debian/rules b/debian/rules index 50e26c1..6dce639 100755 --- a/debian/rules +++ b/debian/rules @@ -6,10 +6,6 @@ # see FEATURE AREAS in dpkg-buildflags(1) export DEB_BUILD_MAINT_OPTIONS = hardening=+all -# CMake doesn't use CPPFLAGS, pass them to CFLAGS/CXXFLAGS to enable the -# missing (hardening) flags. -CFLAGS += $(CPPFLAGS) - include /usr/share/dpkg/architecture.mk %: -- 2.30.2